treewide: Fix weblate conflicts
authorHannu Nyman <[email protected]>
Mon, 21 Apr 2025 19:11:19 +0000 (22:11 +0300)
committerHannu Nyman <[email protected]>
Mon, 21 Apr 2025 19:11:19 +0000 (22:11 +0300)
commitb0b22de5710343a467b0c696670b225e9bed0436
tree10ea1dd40c63d8cd796226c488ca9f27392cf989
parent4461b127436caac84c1ed1ce0ce937fdfb282d2d
parent71c33ad953bb537d11c162b7a4501663733c81ca
treewide: Fix weblate conflicts

Merge remote-tracking branch 'weblate/master' and fix conflicts.

Signed-off-by: Hannu Nyman <[email protected]>